lib/commit: Fix bare → bare imports
authorColin Walters <walters@verbum.org>
Wed, 16 Jan 2019 13:30:53 +0000 (08:30 -0500)
committerAtomic Bot <atomic-devel@projectatomic.io>
Wed, 16 Jan 2019 14:37:15 +0000 (14:37 +0000)
Regression from https://github.com/ostreedev/ostree/pull/1771

This broke rpmostreepayload in Anaconda where we import a bare repo:
https://openqa.fedoraproject.org/tests/345339#step/_do_install_and_reboot/4

Reported-by: Adam Williamson <adamwill@fedoraproject.org>
Closes: #1803
Approved by: jlebon

src/libostree/ostree-repo-commit.c

index 533cf03a9c335e23b6c2c12848e46d374cef371d..c95e0b611d669f324afbf384cc45c977f2c6aab2 100644 (file)
@@ -4269,7 +4269,7 @@ import_one_object_direct (OstreeRepo    *dest_repo,
         G_IN_SET (src_repo->mode, OSTREE_REPO_MODE_BARE, OSTREE_REPO_MODE_BARE_USER);
       if (src_is_bare_or_bare_user && !OSTREE_OBJECT_TYPE_IS_META(objtype))
         {
-          if (src_repo == OSTREE_REPO_MODE_BARE)
+          if (src_repo->mode == OSTREE_REPO_MODE_BARE)
             {
               g_autoptr(GVariant) xattrs = NULL;
               if (!glnx_fd_get_all_xattrs (src_fd, &xattrs,